From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Thu, 23 Apr 2020 22:04:27 +0000 (-0300)
Subject: appDisplay: Return the parent class' result in overrides
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~684^2^2~475
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2a9ccf2e2c2f2049b5aacfc163bb45fd36de6a8b;p=gnome-shell.git

appDisplay: Return the parent class' result in overrides

StButton returns CLUTTER_EVENT_STOP in various circumstances, but
AppIcon throws that away and returns CLUTTER_EVENT_PROPAGATE even
when it should stop.

Return the parent class' result instead of CLUTTER_EVENT_PROPAGATE.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1211
---

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 2d58541f3..8139fe949 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -2213,22 +2213,22 @@ var AppIcon = GObject.registerClass({
     }
 
     vfunc_button_press_event(buttonEvent) {
-        super.vfunc_button_press_event(buttonEvent);
+        const ret = super.vfunc_button_press_event(buttonEvent);
         if (buttonEvent.button == 1) {
             this._setPopupTimeout();
         } else if (buttonEvent.button == 3) {
             this.popupMenu();
             return Clutter.EVENT_STOP;
         }
-        return Clutter.EVENT_PROPAGATE;
+        return ret;
     }
 
     vfunc_touch_event(touchEvent) {
-        super.vfunc_touch_event(touchEvent);
+        const ret = super.vfunc_touch_event(touchEvent);
         if (touchEvent.type == Clutter.EventType.TOUCH_BEGIN)
             this._setPopupTimeout();
 
-        return Clutter.EVENT_PROPAGATE;
+        return ret;
     }
 
     vfunc_clicked(button) {